From 22a2154610ae765f94a49704c90bc9006a1d0bdc Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 19 Sep 2018 08:05:44 +0100
Subject: [PATCH] Run tests under Xvfb with GLX available (see #874077)

---
 debian/changelog             | 2 +-
 debian/rules                 | 2 +-
 debian/tests/build           | 2 +-
 debian/tests/installed-tests | 2 +-
 debian/tests/python3-gi      | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9321875e0a..ce2430d894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,7 +60,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
   * Fix generation of README.md.gz symlinks
   * Generate a dependency on libgtk-4-0.9400.0 since the ABI is not yet
     stable
-  * Run build-time tests under Xvfb
+  * Run tests under Xvfb with GLX available (see #874077)
 
  -- Jeremy Bicha <jbicha@debian.org>  Fri, 19 Jan 2018 22:05:35 -0500
 
diff --git a/debian/rules b/debian/rules
index e55c45ac86..4b9c21a3ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -177,7 +177,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	glib-compile-schemas debian/build/glib-2.0/schemas/
 	# Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail
 	env -u LD_PRELOAD \
-	xvfb-run -a \
+	xvfb-run -a -s "-screen 0 640x480x16" \
 	dh_auto_test --builddirectory=debian/build/deb -- -k 0 -j 1 || true
 endif
 
diff --git a/debian/tests/build b/debian/tests/build
index 5f8caeead7..f79d2df2dc 100755
--- a/debian/tests/build
+++ b/debian/tests/build
@@ -54,6 +54,6 @@ EOF
 gcc -o gtktest gtktest.c `pkg-config --cflags --libs gtk+-4.0`
 echo "build: OK"
 [ -x gtktest ]
-#xvfb-run ./gtktest
+xvfb-run -a -s "-screen 0 640x480x16" \
 ./gtktest
 echo "run: OK"
diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests
index 43f32ef3a4..ae7bf6c250 100755
--- a/debian/tests/installed-tests
+++ b/debian/tests/installed-tests
@@ -12,7 +12,7 @@ export GIO_USE_VOLUME_MONITOR=unix
 export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP"
 
 exec dbus-run-session -- \
-xvfb-run -a \
+xvfb-run -a -s "-screen 0 640x480x16" \
 gnome-desktop-testing-runner \
 --report-directory="$AUTOPKGTEST_ARTIFACTS" \
 --tap \
diff --git a/debian/tests/python3-gi b/debian/tests/python3-gi
index a503b25087..26cf10bd2d 100644
--- a/debian/tests/python3-gi
+++ b/debian/tests/python3-gi
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-xvfb-run python3 <<EOF
+xvfb-run -a -s "-screen 0 640x480x16" \
+python3 <<EOF
 from gi.repository import GLib, Gtk
 
 def do_quit(user_data):
-- 
2.30.2